Merge release 1.6.1

James Moger

2014-10-20 9984ea8f5d9fad31a5e68935756ca8eb406d6b2c

${project.socialNetworkUrl} does not exist in tree 75c50c8ab2bf432f2fd03a81b31b8324a4eb7fd8